Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Auto-travel; prompt when overburdened, and allow stamina-resting #38113

Merged
merged 8 commits into from Feb 20, 2020
Merged

Auto-travel; prompt when overburdened, and allow stamina-resting #38113

merged 8 commits into from Feb 20, 2020

Conversation

ghost
Copy link

@ghost ghost commented Feb 17, 2020

Summary

SUMMARY: Bugfixes "Auto-travel; prompt when overburdened, and allow stamina-resting"

Purpose of change

Fixes #37785

Describe the solution

Prompt when starting autotravel, if player is overburdened, if the yare sure they want to.
Also, fix the fact that the travelling activity, never stopped to catch breath like other activities did.
This was made harder by the fact that the travellign activity, every do_turn() call, nulled itself, and the stamina did not drop as a result of its do_turn(), it dropped afterwards, when the player pathed their automove route, I did something which is perhaps a bit inelegant? and simulated a small drop in stamina after travel do_turn(), so that it passed the stamina < previous_stamina test in player_activity.cpp

Describe alternatives you've considered

N/A

Testing

Picked u pan XL wind turbine, used autotravel, I got the prompt, and if I said yes, then the player moved but paused to catch breath every second or so, so stamina didnt drain completely.

Additional context

N/A

@ifreund ifreund added <Bugfix> This is a fix for a bug (or closes open issue) [C++] Changes (can be) made in C++. Previously named `Code` Mechanics: Character / Player Character / Player mechanics labels Feb 17, 2020
src/overmap_ui.cpp Outdated Show resolved Hide resolved
src/cata_string_consts.h Outdated Show resolved Hide resolved
@ZhilkinSerg ZhilkinSerg merged commit bac0389 into CleverRaven:master Feb 20, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
<Bugfix> This is a fix for a bug (or closes open issue) [C++] Changes (can be) made in C++. Previously named `Code` Mechanics: Character / Player Character / Player mechanics
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Auto-move doesn't rest when moving overburdened
4 participants